home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Linux Cubed Series 7: Sunsite
/
Linux Cubed Series 7 - Sunsite Vol 1.iso
/
system
/
mail
/
readers
/
pine3.91-
/
pine3.91-LinuxELF.dif
Wrap
Text File
|
1995-07-01
|
7KB
|
176 lines
diff -ur pine3.91/imap/ANSI/c-client/Makefile pine3.91-LinuxELF/imap/ANSI/c-client/Makefile
--- pine3.91/imap/ANSI/c-client/Makefile Mon Oct 10 23:13:22 1994
+++ pine3.91-LinuxELF/imap/ANSI/c-client/Makefile Sat Jul 1 15:06:14 1995
@@ -117,7 +117,8 @@
lnx: # Linux
$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
STDPROTO=bezerkproto \
- RSHPATH=/usr/bin/rsh CFLAGS="-g -O $(EXTRACFLAGS)"
+ RSHPATH=/usr/bin/rsh CFLAGS=" -O2 $(EXTRACFLAGS)"\
+ LDFLAGS=" -lbsd"
mct: # MachTen
$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
diff -ur pine3.91/imap/ANSI/c-client/mh.c pine3.91-LinuxELF/imap/ANSI/c-client/mh.c
--- pine3.91/imap/ANSI/c-client/mh.c Mon Oct 10 02:32:52 1994
+++ pine3.91-LinuxELF/imap/ANSI/c-client/mh.c Sat Jul 1 15:01:08 1995
@@ -807,7 +807,7 @@
stat (LOCAL->dir,&sbuf);
if (sbuf.st_ctime != LOCAL->scantime) {
struct direct **names;
- long nfiles = scandir (LOCAL->dir,&names,mh_select,mh_numsort);
+ long nfiles = scandir (LOCAL->dir,&names,(int (*)())mh_select,(int (*)())mh_numsort);
old = nmsgs ? mail_elt (stream,nmsgs)->data1 : 0;
/* note scanned now */
LOCAL->scantime = sbuf.st_ctime;
@@ -1048,7 +1048,7 @@
return NIL;
}
mh_file (tmp,mailbox); /* build file name we will use */
- if (nfiles = scandir (tmp,&names,mh_select,mh_numsort)) {
+ if (nfiles = scandir (tmp,&names,(int (*)())mh_select,(int (*)())mh_numsort)) {
/* largest number */
last = atoi (names[nfiles-1]->d_name);
for (i = 0; i < nfiles; ++i) /* free directory */
diff -ur pine3.91/imap/ANSI/c-client/news.c pine3.91-LinuxELF/imap/ANSI/c-client/news.c
--- pine3.91/imap/ANSI/c-client/news.c Mon Oct 10 01:52:45 1994
+++ pine3.91-LinuxELF/imap/ANSI/c-client/news.c Sat Jul 1 15:01:08 1995
@@ -310,7 +310,7 @@
stream->mailbox + 1);
while (s = strchr (s,'.')) *s = '/';
/* scan directory */
- if ((nmsgs = scandir (tmp,&names,news_select,news_numsort)) >= 0) {
+ if ((nmsgs = scandir (tmp,&names,(int (*)())news_select,(int (*)())news_numsort)) >= 0) {
stream->local = fs_get (sizeof (NEWSLOCAL));
LOCAL->dirty = NIL; /* no update to .newsrc needed yet */
LOCAL->dir = cpystr (tmp); /* copy directory name for later */
diff -ur pine3.91/imap/ANSI/c-client/os_lnx.c pine3.91-LinuxELF/imap/ANSI/c-client/os_lnx.c
--- pine3.91/imap/ANSI/c-client/os_lnx.c Wed Aug 31 01:16:22 1994
+++ pine3.91-LinuxELF/imap/ANSI/c-client/os_lnx.c Sat Jul 1 15:01:09 1995
@@ -45,7 +45,6 @@
#include <netdb.h>
#include <ctype.h>
#include <errno.h>
-extern int errno; /* just in case */
#include <pwd.h>
#include "misc.h"
extern char *crypt();
diff -ur pine3.91/imap/non-ANSI/c-client/Makefile pine3.91-LinuxELF/imap/non-ANSI/c-client/Makefile
--- pine3.91/imap/non-ANSI/c-client/Makefile Mon Oct 10 23:13:22 1994
+++ pine3.91-LinuxELF/imap/non-ANSI/c-client/Makefile Sat Jul 1 15:01:09 1995
@@ -117,7 +117,7 @@
lnx: # Linux
$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
STDPROTO=bezerkproto \
- RSHPATH=/usr/bin/rsh CFLAGS="-g -O $(EXTRACFLAGS)"
+ RSHPATH=/usr/bin/rsh CFLAGS=" -O2 $(EXTRACFLAGS)"
mct: # MachTen
$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
diff -ur pine3.91/imap/non-ANSI/imapd/Makefile pine3.91-LinuxELF/imap/non-ANSI/imapd/Makefile
--- pine3.91/imap/non-ANSI/imapd/Makefile Tue Oct 12 05:29:19 1993
+++ pine3.91-LinuxELF/imap/non-ANSI/imapd/Makefile Sat Jul 1 15:01:09 1995
@@ -40,7 +40,7 @@
LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
imapd: $(CCLIENTLIB) imapd.o
- $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
+ $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) -lbsd
imapd.o: $C/mail.h $C/misc.h $C/osdep.h
diff -ur pine3.91/pico/makefile.lnx pine3.91-LinuxELF/pico/makefile.lnx
--- pine3.91/pico/makefile.lnx Tue Oct 11 21:57:36 1994
+++ pine3.91-LinuxELF/pico/makefile.lnx Sat Jul 1 15:01:09 1995
@@ -40,18 +40,18 @@
#
#includes symbol for debugging
-DASHO= -g
+#DASHO= -g
#for normal build
-#DASHO= -O2
+DASHO= -O2
-CFLAGS= -Dbsd -DLINUX -DPOSIX -DJOB_CONTROL
+CFLAGS= -DLINUX -DPOSIX -DJOB_CONTROL
# switches for library building
LIBCMD= ar
LIBARGS= ru
RANLIB= ranlib
-LIBS= -ltermcap
+LIBS= -ltermcap -lbsd
OFILES= attach.o ansi.o basic.o bind.o browse.o buffer.o \
composer.o display.o file.o fileio.o line.o osdep.o \
diff -ur pine3.91/pico/os_unix.h pine3.91-LinuxELF/pico/os_unix.h
--- pine3.91/pico/os_unix.h Mon Oct 10 23:29:05 1994
+++ pine3.91-LinuxELF/pico/os_unix.h Sat Jul 1 15:01:09 1995
@@ -161,9 +161,9 @@
extern struct KBSTREE *kpadseqs;
#endif /* TERMCAP */
-#if defined(bsd) || defined(nxt) || defined(dyn)
+#if defined(bsd) || defined(nxt) || defined(dyn) || defined(linux)
#ifdef ANSI
-extern char *getcwd(char *, int);
+extern char *getcwd(char *, size_t);
#else
extern char *getcwd();
#endif
diff -ur pine3.91/pine/makefile.lnx pine3.91-LinuxELF/pine/makefile.lnx
--- pine3.91/pine/makefile.lnx Tue Oct 11 22:24:30 1994
+++ pine3.91-LinuxELF/pine/makefile.lnx Sat Jul 1 15:01:09 1995
@@ -57,14 +57,14 @@
RM= rm -f
LN= ln -s
MAKE= make
-OPTIMIZE= # -O2
+OPTIMIZE= -O2
PROFILE= # -pg
-DEBUG= -DDEBUG
+DEBUG= # -DDEBUG
IMAPDIR= ../c-client
PICODIR= ../pico
-LIBES= -ltermcap
+LIBES= -ltermcap -lbsd
LOCLIBES= $(PICODIR)/libpico.a $(IMAPDIR)/c-client.a
CFLAGS= -DLNX -DSYSTYPE=\"LNX\" $(OPTIMIZE) $(PROFILE) $(DEBUG)
diff -ur pine3.91/pine/osdep/os-lnx.h pine3.91-LinuxELF/pine/osdep/os-lnx.h
--- pine3.91/pine/osdep/os-lnx.h Tue Oct 11 22:52:00 1994
+++ pine3.91-LinuxELF/pine/osdep/os-lnx.h Sat Jul 1 15:01:09 1995
@@ -132,8 +132,8 @@
/*----- System-wide config file ----------------------------------------*/
-#define SYSTEM_PINERC "/usr/local/lib/pine.conf"
-#define SYSTEM_PINERC_FIXED "/usr/local/lib/pine.conf.fixed"
+#define SYSTEM_PINERC "/usr/lib/pine.conf"
+#define SYSTEM_PINERC_FIXED "/usr/lib/pine.conf.fixed"
@@ -267,7 +267,7 @@
/*-- What argument does wait(2) take? Define this if it is a union -----*/
-#define HAVE_WAIT_UNION /* the arg to wait is a union wait * */
+/* #define HAVE_WAIT_UNION /* the arg to wait is a union wait * */
/*-------- Is window resizing available? -------------------------------*/
@@ -325,7 +325,7 @@
investigated. Users tend to go in and out of Pine a few times and there
is one file for each pine invocation
----*/
-#define NUMDEBUGFILES 4
+#define NUMDEBUGFILES 1
/*----------------------------------------------------------------------
The default debug level to set (approximate meanings):